Ignore SIGPIPE in the Merlin server process #1746
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nojb
reviewed
Apr 4, 2024
voodoos
reviewed
Apr 5, 2024
There was a problem hiding this comment.
The changes look reasonnable to me.
Just a few thougts to understand better why this change is useful:
Merlin's "client" processes are usually short lived and not subject to frequent crashes. (Crashes due to issues with analysis crash the server, not the client.)
So I guess this is most impactful when Merlin gets stuck into a slow computation and the user kills the client process to bring back control to the editor ? (This doesn't stop the server from finishing the work, and then crash due to sigpipe.)
Am I correct ? Is there another sequence of events that lead to these undesirable sigpipes ?
Yes, that's exactly right. BTW, since killing the client process doesn't actually cancel the operation, subsequent merlin clients still have to wait for the first operation to complete. So control can be returned to the user, but subsequent commands may still have slow results. It would be nice if killing the client actually also cancelled the operation. |
voodoos
approved these changes
Apr 19, 2024
|
Thanks @catern ! |
voodoos
added a commit
to voodoos/merlin
that referenced
this pull request
May 13, 2024
from liam923/ignore-sigpipe
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
May 17, 2024
CHANGES:
Fri May 17 19:59:42 CET 2024
+ merlin binary
- Support for OCaml 5.2 (ocaml/merlin#1757)
- destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
- Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
fixes ocaml/merlin#1661)
- Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
- Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
- Improve cursor position detection in longidents (ocaml/merlin#1756)
- Addition of a `merlin-lib.commands` library which disassociates the
execution of commands from the `new_protocol`, from the binary, allowing
it to be invoked from other projects (ocaml/merlin#1758)
- New occurrences backend: Don't index occurrences when `merlin.hide`
attribute is present. (ocaml/merlin#1768)
- Use the new `uid_to_decl` table in 5.2's cmt files to get documentation.
(ocaml/merlin#1773)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
May 31, 2024
CHANGES:
May May 31 14:02:42 CET 2024
+ merlin binary
- destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
- Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
fixes ocaml/merlin#1661)
- Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
- Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
- Improve cursor position detection in longidents (ocaml/merlin#1756)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
May 31, 2024
CHANGES:
Fri May 31 14:02:42 CEST 2024
+ merlin binary
- destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
- Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
fixes ocaml/merlin#1661)
- Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
- Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
- Improve cursor position detection in longidents (ocaml/merlin#1756)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
May 31, 2024
CHANGES:
Fri May 31 14:02:42 CEST 2024
+ merlin binary
- destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
- Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
fixes ocaml/merlin#1661)
- Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
- Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
- Improve cursor position detection in longidents (ocaml/merlin#1756)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
May 31, 2024
CHANGES:
Fri May 31 14:02:42 CEST 2024
+ merlin binary
- destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
- Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
fixes ocaml/merlin#1661)
- Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
- Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
- Improve cursor position detection in longidents (ocaml/merlin#1756)
avsm
pushed a commit
to avsm/opam-repository
that referenced
this pull request
Sep 5, 2024
CHANGES:
Fri May 31 14:02:42 CEST 2024
+ merlin binary
- destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
- Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
fixes ocaml/merlin#1661)
- Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
- Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
- Improve cursor position detection in longidents (ocaml/merlin#1756)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bringing in changes from merlin-jst.
From @catern:
The merlin server writes to pipes received from the merlin client process. If the read end of those pipes is closed, e.g. because the merlin client process was killed, then when the server writes to the pipe it will generate a SIGPIPE. This kills the Merlin server. Ignore the SIGPIPE instead of unnecessarily dying.
The fact that you get SIGPIPE when you write to a closed pipe is a classic Unix footgun, and this is the usual resolution. Another solution is to avoid pipes (in favor of e.g. socketpairs), but we can't do that because we write directly to the file descriptors received from the client.